fix #16822 #16884
Merged
fix #16822 #16884
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
metagn
reviewed
Jan 31, 2021
|
@xflywind, awesome this also fixes #14574; please add these tests: block: # bug #14574
proc fn(): auto =
let a = @[("foo", (12, 13))]
for (k,v) in a:
return (k,v)
doAssert fn() == ("foo", (12, 13))
block: # bug #14574
iterator fn[T](a:T): lent T = yield a
let a = (10, (11,))
proc bar(): auto =
for (x,y) in fn(a):
return (x,y)
doAssert bar() == (10, (11,))and change: to # bug #14574
testRoundtrip({"z": (f1: 'f'), }.toTable): """{"z":{"f1":102}}"""in and add: "fix #14574" to your PR description so it auto-closes it thanks! |
timotheecour
reviewed
Feb 1, 2021
timotheecour
reviewed
Feb 1, 2021
| @@ -1077,10 +1077,10 @@ proc genAsgnAux(p: PProc, x, y: PNode, noCopyNeeded: bool) = | |||
| # supports proc getF(): var T | |||
| if x.kind in {nkHiddenDeref, nkDerefExpr} and x[0].kind in nkCallKinds: | |||
| lineF(p, "nimCopy($1, $2, $3);$n", | |||
| [a.res, b.res, genTypeInfo(p, y.typ)]) | |||
| [a.res, b.res, genTypeInfo(p, x.typ)]) | |||
There was a problem hiding this comment.
does
lineF(p, "$1 = nimCopy(null, $2, $3);$n",
[a.rdLoc, b.res, genTypeInfo(p, y.typ)])a few lines above also need to change to y.typ => x.typ?
(I don't know which one is correct)
|
@timotheecour's remarks can be done later, merging this as it is because it's small and simple. |
ardek66
pushed a commit
to ardek66/Nim
that referenced
this pull request
Mar 26, 2021
* see whether it breaks * fix nim-lang#16884 * correct * fix nim-lang#14574
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #16822
fix #14574
The kind of y may be
nkHiddenAddr(so could be fixed byskipAddrtoo), so usingx.typemay be more correct.